* (bug 14220) Disabling $wgCheckFileExtensions now works without also disabling ...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5ca8f7b..9562a22 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -289,7 +289,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 12773) addOnloadHook() now calls functions immediately when scripts are
   loaded after the primary page completion, instead of dropping them
 * (bug 14199) Fix deletion form for image redirect pages
-
+* (bug 14220) Disabling $wgCheckFileExtensions now works without also
+  disabling $wgStrictFileExtensions
 
 === API changes in 1.13 ===
 

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index 03ff46e..ac52d44 100644 (file)
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -458,12 +458,13 @@ class UploadForm {
                }
 
                /* Don't allow users to override the blacklist (check file extension) */
-               global $wgStrictFileExtensions;
+               global $wgCheckFileExtensions, $wgStrictFileExtensions;
                global $wgFileExtensions, $wgFileBlacklist;
                if ($finalExt == '') {
                        return self::FILETYPE_MISSING;
                } elseif ( $this->checkFileExtensionList( $ext, $wgFileBlacklist ) ||
-                               ($wgStrictFileExtensions && !$this->checkFileExtension( $finalExt, $wgFileExtensions ) ) ) {
+                               ($wgCheckFileExtensions && $wgStrictFileExtensions &&
+                                       !$this->checkFileExtension( $finalExt, $wgFileExtensions ) ) ) {
                        $resultDetails = array( 'finalExt' => $finalExt );
                        return self::FILETYPE_BADTYPE;
                }